From 0d88fe65bad9058432793281a7d95d61b6d3e898 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 12 Nov 2016 18:58:18 +0100 Subject: [PATCH] stack: Use gtk_widget_measure --- gtk/gtkstack.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index b865104eef..7416718184 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -2230,11 +2230,14 @@ gtk_stack_allocate (GtkCssGadget *gadget, if (priv->last_visible_child) { int min, nat; - gtk_widget_get_preferred_width (priv->last_visible_child->widget, &min, &nat); + + gtk_widget_measure (priv->last_visible_child->widget, GTK_ORIENTATION_HORIZONTAL, + -1, + &min, &nat, NULL, NULL); child_allocation.width = MAX (min, allocation->width); - gtk_widget_get_preferred_height_for_width (priv->last_visible_child->widget, - child_allocation.width, - &min, &nat); + gtk_widget_measure (priv->last_visible_child->widget, GTK_ORIENTATION_VERTICAL, + child_allocation.width, + &min, &nat, NULL, NULL); child_allocation.height = MAX (min, allocation->height); gtk_widget_size_allocate (priv->last_visible_child->widget, &child_allocation); -- 2.30.2